Auto merge of #2072 - durka:patch-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 Oct 2015 17:13:33 +0000 (17:13 +0000)
committerbors <bors@rust-lang.org>
Wed, 21 Oct 2015 17:13:33 +0000 (17:13 +0000)

Trivial merge